Autogenerated HTML docs for v1.1.4-g5b2b
diff --git a/git-commit.html b/git-commit.html index 01c6960..44e85ed 100644 --- a/git-commit.html +++ b/git-commit.html
@@ -296,7 +296,7 @@ <p> Update all paths in the index file. This flag notices files that have been modified and deleted, but new files - you have not told about git are not affected. + you have not told git about are not affected. </p> </dd> <dt> @@ -399,7 +399,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 13-Jan-2006 19:58:26 PDT +Last updated 21-Jan-2006 23:50:16 PDT </div> </div> </body>
diff --git a/git-commit.txt b/git-commit.txt index e35984d..72f96fc 100644 --- a/git-commit.txt +++ b/git-commit.txt
@@ -27,7 +27,7 @@ -a|--all:: Update all paths in the index file. This flag notices files that have been modified and deleted, but new files - you have not told about git are not affected. + you have not told git about are not affected. -c or -C <commit>:: Take existing commit object, and reuse the log message
diff --git a/git-grep.html b/git-grep.html index fcf2127..4fb85d5 100644 --- a/git-grep.html +++ b/git-grep.html
@@ -272,7 +272,7 @@ </div> <h2>SYNOPSIS</h2> <div class="sectionbody"> -<p><em>git-grep</em> [<option>…] <pattern> [<path>…]</p> +<p><em>git-grep</em> [<option>…] [-e] <pattern> [--] [<path>…]</p> </div> <h2>DESCRIPTION</h2> <div class="sectionbody"> @@ -283,21 +283,41 @@ <div class="sectionbody"> <dl> <dt> +<tt>--</tt> +</dt> +<dd> +<p> + Signals the end of options; the rest of the parameters + are <path> limiters. +</p> +</dd> +<dt> <option>… </dt> <dd> <p> Either an option to pass to <tt>grep</tt> or <tt>git-ls-files</tt>. - Some <tt>grep</tt> options, such as <tt>-C</tt> and <tt>-m</tt>, that take - parameters are known to <tt>git-grep</tt>. </p> +<div class="literalblock"> +<div class="content"> +<pre><tt>The following are the specific `git-ls-files` options +that may be given: `-o`, `--cached`, `--deleted`, `--others`, +`--killed`, `--ignored`, `--modified`, `--exclude=*`, +`--exclude-from=*`, and `--exclude-per-directory=*`.</tt></pre> +</div></div> +<div class="literalblock"> +<div class="content"> +<pre><tt>All other options will be passed to `grep`.</tt></pre> +</div></div> </dd> <dt> <pattern> </dt> <dd> <p> - The pattern to look for. + The pattern to look for. The first non option is taken + as the pattern; if your pattern begins with a dash, use + <tt>-e <pattern></tt>. </p> </dd> <dt> @@ -325,7 +345,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 06-Jan-2006 17:12:33 PDT +Last updated 21-Jan-2006 23:50:17 PDT </div> </div> </body>
diff --git a/git-grep.txt b/git-grep.txt index 2bfd8ed..bf4b592 100644 --- a/git-grep.txt +++ b/git-grep.txt
@@ -8,7 +8,7 @@ SYNOPSIS -------- -'git-grep' [<option>...] <pattern> [<path>...] +'git-grep' [<option>...] [-e] <pattern> [--] [<path>...] DESCRIPTION ----------- @@ -18,13 +18,24 @@ OPTIONS ------- +`--`:: + Signals the end of options; the rest of the parameters + are <path> limiters. + <option>...:: Either an option to pass to `grep` or `git-ls-files`. - Some `grep` options, such as `-C` and `-m`, that take - parameters are known to `git-grep`. + + The following are the specific `git-ls-files` options + that may be given: `-o`, `--cached`, `--deleted`, `--others`, + `--killed`, `--ignored`, `--modified`, `--exclude=*`, + `--exclude-from=*`, and `--exclude-per-directory=*`. + + All other options will be passed to `grep`. <pattern>:: - The pattern to look for. + The pattern to look for. The first non option is taken + as the pattern; if your pattern begins with a dash, use + `-e <pattern>`. <path>...:: Optional paths to limit the set of files to be searched;
diff --git a/git-ls-files.html b/git-ls-files.html index 7148f78..3e5443b 100644 --- a/git-ls-files.html +++ b/git-ls-files.html
@@ -341,6 +341,15 @@ </p> </dd> <dt> +--directory +</dt> +<dd> +<p> + If a whole directory is classified as "other", show just its + name (with a trailing slash) and not its whole contents. +</p> +</dd> +<dt> -u|--unmerged </dt> <dd> @@ -624,7 +633,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 06-Jan-2006 17:12:39 PDT +Last updated 21-Jan-2006 23:50:18 PDT </div> </div> </body>
diff --git a/git-ls-files.txt b/git-ls-files.txt index e42af5e..e433407 100644 --- a/git-ls-files.txt +++ b/git-ls-files.txt
@@ -46,6 +46,10 @@ -s|--stage:: Show stage files in the output +--directory:: + If a whole directory is classified as "other", show just its + name (with a trailing slash) and not its whole contents. + -u|--unmerged:: Show unmerged files in the output (forces --stage)
diff --git a/git-reset.html b/git-reset.html index 83ee367..915201d 100644 --- a/git-reset.html +++ b/git-reset.html
@@ -448,8 +448,8 @@ Interrupted workflow </dt> <dd> -<p>You can get interrupted by an ungent fix request while you are -still in the middle of a large change. The files in your +<p>Suppose you are interrupted by an urgent fix request while you +are in the middle of a large change. The files in your working tree are not in any shape to be committed yet, but you need to get to the other branch for a quick bugfix.</p> <div class="listingblock"> @@ -465,8 +465,8 @@ $ git reset <b>(3)</b> <b>(1)</b> This commit will get blown away so a throw-away log message is OK. -<b>(2)</b> This removes the 'WIP' commit from the commit history, and makes - your working tree in the state just before you made that snapshot. +<b>(2)</b> This removes the 'WIP' commit from the commit history, and sets + your working tree to the state just before you made that snapshot. <b>(3)</b> After <b>(2)</b>, the index file still has all the WIP changes you committed in <b>(1)</b>. This sets it to the last commit you were basing the WIP changes on.</tt></pre> @@ -488,7 +488,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 13-Jan-2006 19:58:30 PDT +Last updated 21-Jan-2006 23:50:19 PDT </div> </div> </body>
diff --git a/git-reset.txt b/git-reset.txt index 315683a..b4e737e 100644 --- a/git-reset.txt +++ b/git-reset.txt
@@ -147,8 +147,8 @@ Interrupted workflow:: + -You can get interrupted by an ungent fix request while you are -still in the middle of a large change. The files in your +Suppose you are interrupted by an urgent fix request while you +are in the middle of a large change. The files in your working tree are not in any shape to be committed yet, but you need to get to the other branch for a quick bugfix. + @@ -164,8 +164,8 @@ $ git reset <3> <1> This commit will get blown away so a throw-away log message is OK. -<2> This removes the 'WIP' commit from the commit history, and makes - your working tree in the state just before you made that snapshot. +<2> This removes the 'WIP' commit from the commit history, and sets + your working tree to the state just before you made that snapshot. <3> After <2>, the index file still has all the WIP changes you committed in <1>. This sets it to the last commit you were basing the WIP changes on.
diff --git a/git-svnimport.html b/git-svnimport.html index c8ab35c..38f38b8 100644 --- a/git-svnimport.html +++ b/git-svnimport.html
@@ -282,16 +282,7 @@ <div class="sectionbody"> <p>Imports a SVN repository into git. It will either create a new repository, or incrementally import into an existing one.</p> -<div class="hlist"><table> -<tr> -<td class="hlist1"> -SVN access is done by the SVN -</td> -<td class="hlist2"> -Perl module. -</td> -</tr> -</table></div> +<p>SVN access is done by the SVN::Perl module.</p> <p>git-svnimport assumes that SVN repositories are organized into one "trunk" directory where the main development happens, "branch/FOO" directories for branches, and "/tags/FOO" directories for tags. @@ -393,8 +384,8 @@ </p> <div class="literalblock"> <div class="content"> -<pre><tt>Formerly, this option controlled how many revisions to pull, due to -SVN memory leaks. (These have been worked around.)</tt></pre> +<pre><tt>Formerly, this option controlled how many revisions to pull, +due to SVN memory leaks. (These have been worked around.)</tt></pre> </div></div> </dd> <dt> @@ -439,18 +430,13 @@ repository itself; it usually ends in "/svn".</p> </dd> <dt> -<SVN_repository_URL> +<path> </dt> <dd> <p> - The URL of the SVN module you want to import. For local - repositories, use "file:///absolute/path". + The path to the module you want to check out. </p> </dd> -</dl> -<p><path> - The path to the module you want to check out.</p> -<dl> <dt> -h </dt> @@ -483,7 +469,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 06-Jan-2006 17:12:46 PDT +Last updated 21-Jan-2006 23:50:20 PDT </div> </div> </body>
diff --git a/git-svnimport.txt b/git-svnimport.txt index db1ce38..63e28b8 100644 --- a/git-svnimport.txt +++ b/git-svnimport.txt
@@ -21,7 +21,7 @@ Imports a SVN repository into git. It will either create a new repository, or incrementally import into an existing one. -SVN access is done by the SVN:: Perl module. +SVN access is done by the SVN::Perl module. git-svnimport assumes that SVN repositories are organized into one "trunk" directory where the main development happens, "branch/FOO" @@ -74,8 +74,8 @@ -l <max_rev>:: Specify a maximum revision number to pull. - Formerly, this option controlled how many revisions to pull, due to - SVN memory leaks. (These have been worked around.) + Formerly, this option controlled how many revisions to pull, + due to SVN memory leaks. (These have been worked around.) -v:: Verbosity: let 'svnimport' report what it is doing. @@ -100,11 +100,7 @@ If you're using the "-d" or "-D" option, this is the URL of the SVN repository itself; it usually ends in "/svn". -<SVN_repository_URL>:: - The URL of the SVN module you want to import. For local - repositories, use "file:///absolute/path". - -<path> +<path>:: The path to the module you want to check out. -h::
